dgit.raspbian.org Git - emacs.git/commit

projects / emacs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 34a3535 acf9bf8)

author	Glenn Morris <rgm@gnu.org>
	Sat, 15 Jan 2011 20:38:27 +0000 (12:38 -0800)
committer	Glenn Morris <rgm@gnu.org>
	Sat, 15 Jan 2011 20:38:27 +0000 (12:38 -0800)
commit	d871c8b7f89287d420c5d6f7815f00c4fa5a4928
tree	9b0a9564fc9cebef9784970936363de3793bc846	tree \| snapshot
parent	34a35353eb527b607e3e5a4c84b61e0209193d92	commit \| diff
parent	acf9bf83a02cdc138c35a803ee0fcb7be6240807	commit \| diff

Merge from emacs-23 branch, up to r100382.
Note:
emacs-23 r100373 is rendered unnecessary by pre-existing 2010-05-20
trunk change.

12 files changed:

doc/emacs/ChangeLog	diff1 \|	diff2 \|	blob \| history
doc/emacs/building.texi	diff1 \|	diff2 \|	blob \| history
doc/emacs/files.texi	diff1 \|	diff2 \|	blob \| history
etc/NEWS.23	diff1 \|	\|	blob \| history
lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/files.el	diff1 \|	diff2 \|	blob \| history
lisp/gnus/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/gnus/message.el	diff1 \|	diff2 \|	blob \| history
lisp/mail/rmailmm.el	diff1 \|	diff2 \|	blob \| history
lisp/subr.el	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/window.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.